]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
workspacesView: Don't double-destroy workspaces
authorJasper St. Pierre <jstpierre@mecheye.net>
Wed, 11 Sep 2013 00:40:24 +0000 (20:40 -0400)
committerJasper St. Pierre <jstpierre@mecheye.net>
Wed, 11 Sep 2013 14:15:26 +0000 (10:15 -0400)
The WorkspaceView actors contain the Workspace actors, so destroying the
WorkspaceView actors should be enough.

https://bugzilla.gnome.org/show_bug.cgi?id=707889

js/ui/workspacesView.js

index 50f079c3e74c32280db538c5a15b07f9477e453b..f4de48b14c0a7d1c11b23bb9aaad4fca7e7a4615 100644 (file)
@@ -540,12 +540,6 @@ const WorkspacesDisplay = new Lang.Class({
         for (let i = 0; i < this._workspacesViews.length; i++)
             this._workspacesViews[i].destroy();
         this._workspacesViews = [];
-
-        for (let i = 0; i < this._workspaces.length; i++)
-            for (let w = 0; w < this._workspaces[i].length; w++) {
-                this._workspaces[i][w].disconnectAll();
-                this._workspaces[i][w].destroy();
-            }
     },
 
     _workspacesOnlyOnPrimaryChanged: function() {
@@ -561,10 +555,6 @@ const WorkspacesDisplay = new Lang.Class({
         for (let i = 0; i < this._workspacesViews.length; i++)
             this._workspacesViews[i].destroy();
 
-        for (let i = 0; i < this._workspaces.length; i++)
-            for (let w = 0; w < this._workspaces[i].length; w++)
-                this._workspaces[i][w].destroy();
-
         this._workspacesViews = [];
         this._workspaces = [];
         let monitors = Main.layoutManager.monitors;